[IA64] domheap: Don't refer struct domain from GET_VA_VCPU_VHPT_MADDR()

So far, current->domain->arch.flags.has_pervcpu_vhpt is used.
Instead use current->arch.vhpt_page.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/arch/ia64/asm-offsets.c b/xen/arch/ia64/asm-offsets.c
index 1c7acdbd14e232473ea2a7be85220e05bb9c207c..bcff61615905b4e2b534f5fe9249c7f8c35a0743 100644 (file)
--- a/xen/arch/ia64/asm-offsets.c
+++ b/xen/arch/ia64/asm-offsets.c
@@ -253,9 +253,8 @@ void foo(void)
        DEFINE(IA64_MCA_CPU_RBSTORE_OFFSET,
               offsetof(struct ia64_mca_cpu, rbstore));
 
-       DEFINE(IA64_DOMAIN_FLAGS_OFFSET,
-              offsetof(struct domain, arch.flags));
-
+       DEFINE(IA64_VCPU_VHPT_PAGE_OFFSET,
+              offsetof(struct vcpu, arch.vhpt_page));
        DEFINE(IA64_VCPU_VHPT_MADDR_OFFSET,
               offsetof(struct vcpu, arch.vhpt_maddr));
 

diff --git a/xen/arch/ia64/linux-xen/mca_asm.S b/xen/arch/ia64/linux-xen/mca_asm.S
index 2f25294a0e0fa19b0d23fe010a2ffa347629cd1c..7b6fd94abb5825e882084372a3161a840a9eb926 100644 (file)
--- a/xen/arch/ia64/linux-xen/mca_asm.S
+++ b/xen/arch/ia64/linux-xen/mca_asm.S
@@ -196,13 +196,9 @@
        add reg=IA64_KR_CURRENT_OFFSET,reg;;                    \
        ld8 reg=[reg];;                                         \
        dep tmp=0,reg,60,4;;                    /* V to P */    \
-       add tmp=IA64_VCPU_DOMAIN_OFFSET,tmp;;                   \
+       add tmp=IA64_VCPU_VHPT_PAGE_OFFSET,tmp;;                \
        ld8 tmp=[tmp];;                                         \
-       dep tmp=0,tmp,60,4;;                    /* V to P */    \
-       add tmp=IA64_DOMAIN_FLAGS_OFFSET,tmp;;                  \
-       ld8 tmp=[tmp];;                                         \
-       and tmp=HAS_PERVCPU_VHPT_MASK,tmp;;                     \
-       cmp.eq p6,p0=tmp,r0;                                    \
+       cmp.eq p6,p0=tmp,r0;    /* v->arch.vhpt_page == NULL */ \
 (p6)   br.cond.sptk 1f;                                        \
        add reg=IA64_VCPU_VHPT_MADDR_OFFSET,reg;;               \
        dep reg=0,reg,60,4;;                    /* V to P */    \